Fix imports once and for all