Minor changes to get newrelic to work