Fixes following further testing across multiple db platforms

Final testing fixes before sending for initial release