Fix slot number
Fix dependencies