Corrections after @adgreenway comment