SPEC fixes