various fix-ups