Fix more spec fallout from fix for #543