Update fixed imports