Patched a few things again