Fix some instances of load_gicon