Completed porting to tsc 0.9.1.1