Small tweaks (imports)