Gabel Sharess: fix miscellaneous issues