More import fixes. Add missing enum.