Tiny bugs and fixes
0.10.0