Misc RC spec fixes that we ran into in CI.

/cc: @opscode/client-engineers