re-add stuff that got lost with JH's fixes...