Another round of changes to configuration and communications bug fixing