Issues from analysis fixed