fixup! Fix crossCompile errors