Misc updates and improvements