Removed bad reference returns and added missing userinfo member.