Fixed issues with updating certain objects.