integration spec fixes