More fixes for BZ 1124700