Fix android workarounds