MOB-2661 - Fixing and tuning.