Fix some incompletely merged stuff
Missing }