Updates for 1.9.3 compatibility (each on string and setting improper encoding with /s in regex).