More type fixes

This one was found by @natdempk