Fix RPG animation
Minor fixes
Fix crash caused by attempting to reseat a reference