updates for cross compilation