Minor Fixes
0.9.9-71