Communication stuff fix