Adding Saneef's Fixes