Fixed some issues with updating