Initial changes I had to make to get the program to compile