Fix breaks identified by TypeScript 0.9.1.1