Bug fixes with updating