Merge fixes (hopefully)