Fixes to make android at least compile