Cross compile improvements