More update fixes