Fix timeScale issues