Client fix and tidy up of resource collection