Some minor import fixes.
Merge branch 'martinal/topic-ufl-core-redesign' into next