Some work on 1.6 compatibility