Core&Conf: Small cosmetic fixes

Closes #11392

Signed-off-by: DDuarte <dnpd.dd@gmail.com>