Changes for Windows and local Pg testing.