-Fixes for the Update