Fix instabilities on offline specs