Fixed crashes / reload issues