Fix breaks identified by TypeScript 0.9.1.1
Merge pull request #906 from derekcicerone/patch-8

Fix breaks identified by TypeScript 0.9.1.1