Fix some issues with WeeklyWorkLoad