>6v6 fixes and fix for 're' ready bug