Resolved code analysis errors