adapt some imports

2 jobs for master in 3 minutes and 7 seconds (queued for 2 seconds)