Gabel: some changes/updates