Fix a lot of the compile errors.