more gen 1 fixes