Jun 24, 2022 - Two 'bug' fixes