spec fixes part 1