This should fix some of the type conflicts we've been seeing. (DM/SA)
Merge pull request #353 from lukecampbell/fixes

Fixes