Fix warnings.

When running the specs after the last two changes, I noticed there were some warnings emitted during the spec run. This fixes those.