Tranalyzer fixes. Need to do TODO