More incompatible type fixes