Fix a number of other compile fails on 10