moses/mserver: fix entity issues