Several fixes
0.5.6