Crash Errors Fixed