Framework.jar CM code patches