Fix stuff that changed