further 5.3 compatibility adjustments, including tests