More updates on types.