Merge in some changes