CR1: Small updates