Update upstream
Fix spec runs