Next round of fixex. 2/3 are fixed.