Fixes for Motorola device