Reinout yearweek fixes