Fixed some issue crashes.