Minor fixes as suggested by @remram44