Minor fixes based on feedback from @Infocatcher