Small code changes to make it better in ReadTS