Bug#5901 fix some minor bug and change port