Adding Fixes from MNH