Minor changes to support 0.9.0