fixes for comm