Fix errors from merge (from serialize). Don't know how I missed that. I thought I launched the tests...