Build fixes

Fixed build of android and ios client