Fix minor import errors in consumer code.