general fix-ups