Fixes from Ulrich