hulk: fix up options and mode passing again