Minor improvements

Fixed in this release