Patches some bugs yo