Fixes for mobile build