Vishal #647 minor fixes