Quick fixes to parsing