Multi-culture support fixes