Fixes for TS0.9.5