backport spec fixes