Some fixes to jailbreak