Fix some imports after auto import optimization