Manual updates for 0.9