Fix more guards in specs