Address issues raised by @standagh