Some Comm fixes.

This fixes a few issues with `comm.id` no longer existing, and also has a temporary fix for the strange `metadata` method dispatch issue.
I have tried this. Just tried it again, it doesn't help. :/