Bug fixes for interval refactor.