Update make invocation (allow job parallelism)
Add object store tasks
Minor fixup