Fix a bunch more compile errors.