User lookup fix, minor changes