Fixes to lamp