Fix Import elements with *