Fix port, use env var fixes #1