Fixed several things with the new implementation (JS specific for Android).