Fixes from Christoph