Code inspection fixes.