Spec fixes for CI