Fixes to TwoLightsLocalizer and other small fixes