Tweaks

For handle of malformed strings