Address some type warnings