Fixing weird things from merge issue