Fix imports from deprecated modules to use the right location.
Re-add missing import (don't understand why that one's needed).