To cleanup some warning messages