P1 Smart meter: cleanup of some warnings