Fix code audit flags (execpt 1)