Fixed crashes on arrow and targets save