Moar small spec fixes.
Merge pull request #249 from benlovell/moar-spec-fixes

Moar spec fixes