A few adjustments to gpdb module.