Added more type fixes