Fix the things i had broken