Fixed issues with out of sync imports.