Fixed Crashes
Changed block