Fix some stuff up