Minor type fixes before leveldb integration.