Cleanup static analysis errors