Some Comm fixes.