Order localiztion fixes