Reporting

Fixes two Tracker issues:

https://www.pivotaltracker.com/story/show/63393274

https://www.pivotaltracker.com/story/show/63695986