Fixes FriendsViewController and HallViewController