Small changes to ensure communication exists