merge fixes from marcel