Fix some stuff and break some stuff