Fix warnings.

When running the specs before #1214 and #1215, I noticed there were some warnings emitted during the spec run. This fixes those.