Further fixes
0.9.6-59