Import fixes

should help for #575 , #559 and #580