Got rid of some warnings.