Fixed issues with updating