Small fixes
0.8.22