Fixes the things that I broke lol