Address @matiu's comments