Fix some stuff