Allow overriding port
listening fixes