Some Fixes for update