Fixup: Some compiler errors fixed