Few more Comm layer fixes