All these fixed in #37