Fixed dm_server problems