Fixed more comm bugs.