Fix parse problems in 3.1 migration