Fix warnings
Add OPSlotRepository
Fix warnings