initial tweaks so build runs on galaxy s