Fixes. Tested the hypothetical code in comm_manager
Weird fix for a weird bug in metadata. Avert and revert.