Minorf fixes