First fixes following CR.