fixes to OT so it will work on Android