various fixes for weekly/daily