Compatibility with 0.6.3.1 and a few updates