Fix meta-data parsing