Fixed about half of Tims filed issues