Fix a few bugs involving extrapolations