Fix some parsing issues related to underscores