Fix last merge bugs