fixes from Tony