- Add more protocol safeguards (#1743)
- Add two more pre-sizing checks