Various fixes and improvements.