Fixing Typescript 0.9 Compatibility