More bug fixes with Android native events