This should fix some of the type conflicts we've been seeing. (DM/SA)