More 1.7 compatibility fixes