more fix-ups