Changes after @simonw review