Fix issues with doc parsing.