Fix additional serverspec differences