More contriubutions by L.Hotari.
Fix imports after merge.