Fix compile-time errors.

Resolves: https://www.pivotaltracker.com/story/show/76867246