Fixed cc 1.41 issues