Problem fixes - SGA
Discrete fixes - SGA