SW-10 Fixes after CR