Fix merge errors

Stopped working on this before I pushed and forgot to test.