Fixed some problems with updating