Little Bug fixes and improvements