More fixes for #335

These are problems that showed up in 1.4.5 but somehow not in 1.4.4.4