merge fixes, compiles cleanly now