cross compilation related changes