Merge "Fix some bugs found in statsd"