Fix a few audit issues