Defect 6, 8 & 9 fixed