Plus: Giants close to resolving Bader saga