Fix assignment of slots
Some caching issues still.