Import ordering fixes