- fixes from Harro