Additional tweaks to user import