Various minot tweak