Minor clean-ups
Workaround for missing java method in some android SDKs