Minot fixes