yet more data type fixes