Sorted issues with parser TypeErrors