Fixes after audits