Fix large amounts of bugs with the framework update