Fix parsing of a couple of items