A bunch more 1.6 work