Add a few other missing parts.