GB modifications following dry-run.