Corrected Code Analysis issues