Fixed lookup and auth.