Fixed broken imports from last commits