Additional fixes and improvements