Generic Service: multiple fixes