Lighter changes in BlockIgnite as well