Compile with new additions from recent PRs.