Requested fixes 1