Fixed some more issues with parsing