Fixed the last three fuckups