- Signature fixes
- Minor changes