Spec fixes

This fixes 48 of the remaining 205 spec failures.