#21 more fixes