Actually fix the crashes