Fix missing imports
Merge branch 'i3-nicer-interface' into i4-ormhandle