Cross Build enviroment bug fixes