Fixes re: Milo's review