Corrections as per comments on https://github.com/hasgeek/funnel/pull/84