More changes to the source for a 1.7 port.