Added jrebel (again?) + added some ToFixes