Adjust for 2.x changes, next step is to roll this into SwornGuns itself