Merge fixes from Christian Hammers