PR fixes, less postgres conversions