Updates to support Typescript 0.9.1.1