Schedule Fixes