fixes for latest globalize changes