Minor changes and improvements