fixup Configuration usage