Fix serverspec changes from v2