Fix some stuff, break some stuff