Minor fixes in POPCORN parser.

Change-Id: I130c5277dcc5a7209a1b9c12c397b414d70e9ff7