more pre83 fixes