config6: minor level2 branch tweaks