more pre-1.2 adjustments