Cleanup, merge fixes