Small fixes after CR