Fixed audit problems and switched to keg only to avoid system header shadow conflict