Fixes for #6102 and contaminants

fix for contaminants not processing if air is OK otherwise
fix for lighting subarea GCing