changes to make it work on fxos