Fixed known crashes