Fix spec failures
merge fix spec