Fix metavars and add options to the docked group.