Tidy up after commit from @ningosi