Fixing local vars in string/swap