MISC: address @bthirion's comments