Minor fixes requested by dgolovin the reviewer