Order import tweaks