Fix some code inspecton flaws