WIP: config defaults fix