few import tweaks