Several small fixes
0.10.4