Fix edge cases for 0.10.x