LightningBox fixes