Minor optimizations
Fix ISO week