More edge cases so that all is good in 2.0