#725: #409: resolving a handful of small THC-tagged issues

opened by thuchacz