Global Fixes To Prevent Crashes