Lift main and UserProfile fixes