Fixing some small merge bugs