Fixing unmarshaling and groundy service leaking