Fix problems with GPDB