Improved slot handling.