Fix final source integration bugs
Merge commit.