Import queue minor tweaks and bug fixes