type fixes for hw3 pt2; possibly meaningless