More fixes to update