Fix typos and NPE discovered in newrelic logs