Forgot about a few changes from the merge.