Fixes for schedule length