Fix stuff that was lost