Fixes for Windows
Merge branch 'postgres' into simple