Fixes for Droid