v1.0.4: Fixes for buggy national calendar