fix audit issues