CS2Backbone: fixes post merge