Some fixes in the framework add process.