Fix port, add migration