Fixed last merge bugs