Major crash issue fixes