Fix more spec issues