NGScat small fixes