Address some issues raised by @nnnick