Fixed using Srv_remove/disableXXX in compatibility mode

Fixes #2050