Fixes code audit problems