Fixed all known crashes