Some fixes
0.8.28