Fixing code analysis comments