small fix-ups