Small fixes to update