Fix spec failures or skipped