SLI Fixes

Fixes #4

- [x] Missing uses
- [ ] Code duplication
- [ ] Unused methods/parameters/variables
- [ ] Unused uses
- [ ] @ todo's