Fixes after CR