Fixed all the things