#100: More fixes