More changes to make my compiler happy