Here and there minor fixes