Manually patched a few things that didn't get merged in, but should.