Fixed the stuff I broke in the merge conflict.