Small improvements

Yes. That bug should be fix with #148.