Build fixes for android and windows