Manually merged stuff that didn't merge on its own