o3 compilation fixups