Some slight changes to the way object paths are handled