Some bug fixes that exist in the official SDK.