Cleans up build output and adds missing contribs.