Fixes to jellonek's PR

I believe you would want to change this imports.