GPII-20: some tweaks.