Compatibility with 0.9 (#2, #3, #4).