Fixed mistakes from merge