Less upstream stuff for us to cross compile