Updated fixes

Updated fixes