SW-18 Fixes after CR