Fixups to uci-defaults