Code analyzes fixes