Fix updateUser and timeouts