Fixes to user import