Fix compile/merge errors