Arc Lamp facing changes in SMP. Fixes #697.