Some fixes for multiple bulbs