Time Frequency bug fixes