Changes for FTBFS fix NMU 1.17.0-3.1

These are the commits that went into the NMU I uploaded for fixing the FTBFS reported in #1079572. The problems have probably existed before and the FTBFS was caused by warnings becoming failures with newer compiler versions.