Fix server commands