Updated fixes