#148, #171

More fixes