Couple of fixes fo update logic.