misc edits to get postgres out