Fix minor issues with client/resource manager