Making batsd client compatible with Batsd dev branch