- Lint fixes
- Plugin loading fix