fixes after CR