Fix Android workarounds