- Edge case fixes for dummy slots