Fixed more comm code