Other Changes that Got lost during Merge