more fixes to avoid breaking on comments