Many small fixes on the server commands