Tweaks for missing ServiceInterface project