More audits of the code

for the same problem as the last commit