Fixed couple small bugs that Don Walter found.