Applying quality patches

Applying quality patches