Fixed a few errors I noticed from NewRelic
(cherry picked from commit 1a19b4c48f5c33e2f4103fca1da68e87999ad434)