changes for PostgreSql and pulling in some 1.1.14 changes