#340 - Fix imports