PrevNextWeekMixin improvements