Fixes for mobile/etc.