Code analysis corrections