Some more small changes to comms.c