Fixes after CR.