Got rid of some warning messages