Fix imports

Sometimes wildcard imports are simply preferable.