Code inspection error fixes