More fixes, almost parsing once again