More fixes from an old PR