Fixes several definitions for TS 0.9