minor fix-ups