Fix Portugal. Close #312
Fix PSE migrate script. Closes #311