Fix incomplete changes from merge
2 files changed