- 1.6 compatibility fixes