Fixing compiler warnings

https://www.pivotaltracker.com/story/show/81290082