Fixed communication issues