Fixing issues with update