Fixing some issues with parsing