core: fixes
0.2.8