Bring into line with other mqtt2 scripts