More fixes and recoding