More db update fixes