Fixes for buggy android