Info command fixes