Fix some instances of load_gicon
Merge pull request #2981 from collinss/gicon-fix

Fix some instances of load_gicon