Cross compilation updates