Fixes what didn't get put in due to merge conflict.