Changes based on code audit.