More fixes. Work in progress on comm problems.