Some bug fixins before hitting the regex grind