general fix-up