Comment SP fixes