Fixes for globalization