Some fixes for Android, BB and iOS when testing. Please refer to commit for details.