Tweaks to reduce gibberish