More fixups towards a compilable state.