Fat fixes