some tweaks to imports in fit functions