Ported fixes made and tested in the configuration daemon from ByzPi to
Byzantium.

Signed-off-by: The Doctor <drwho@virtadpt.net>