new fixes for timescale