Fixes for Genymotion