Tweaks and updates to frameworks