Solving other parse bugs

Untested