Fixing the leaks

Gerry and Martin fixing the leaks