Many fixes to update