Personalization fixes and improvements