CA-114341: assorted LVHD/GC fixes