Patches some Bugs