Fixes for week of year