Added a few more type fixes