Further adjustments for Droid