Patched a few things