Standardise config reports and fix NPE in battery report