Fix stuff up