Some fixes with localizable