Remove CR and more fixes