Add missing h and i options.