Fix compcomm issues