Some fixes in updates