Spec fixes and such.