More Lamp fixes