Get rid of a few reocuring warnings