Further personalization fixes