Merge newer changes from Master; fix bugs introduced in the merge.