WORKWEEK fixes