Fix some dumb patch merge errors