Fixes and updates to the framework