Fix entity move errors, lighten the load.