CR: some fixes