Fix some stuff.