Convert pop_t1 to standard format
Get everything (except state) working on Linux again