Fix imports and typos

Sometimes wildcard imports are simply preferable.