Fixes following testing across multiple db platforms
Merge pull request #105 from davewinters/master

Fixes following further testing across multiple db platforms