Start on spec fixes