Update Fixes 2/12