CLSN-645 solve all warning issues during compilation