fixes from mark