src: more fixes
0.8.3