More fixes for use macros regarding imports handling