Fix imports
Various small fixes