Fixing small gen bugs