more fixes from Michael.