Lightning fixes