Arvind/Deva - Fixing flak issues