Fix some things, break some other fucking things