Added a bunch more stat calls and fixed same warnings

Change-Id: I05eb7954d81dd708618cd75a245fd3265c565b85