Few fixes and improvements.