Fixes after CR (3)