Fix a couple regressions from merging or sumthin'