Add crude support for non-default ports