Incorporate requests from @mikemcquaid