More comm handling fixes