A few weird merging patches