A bit more fixing, as requested by Matt.