FIX rebuild execute command on some servers

And other