Fix couple of parsing mistakes