Fixes after CR (2)