Improve imports, some None-checks