SW-2 Fixes after CR