Get rid of some type defaulting warnings