Some changes in bin/server