Manually merging more fixes back into OJ base.