fixing some upgrade errors; cross compiling