Updates for 0.9.9