Minor fixes on users import