Fix some stuff up.