Minor changes to fix parsing.