Single import file plus logging entries fixes.