Update for 0.9.9.6