Logging / import tweaks