SW-19 Fixes after CR