Fix stuff from update