Minor issues  fixed for parsing