Jkarni/fix/import warnings

@cahrens @singingwolfboy Fixes [STUD-750]