MISCELLANEOUS
- Fix some internal issues