#21 More fixes