Final fixes to rest update.