A few minor changes and improvements