Communication fixes