Merged in minor fixes for v0.10.1