Fixed some missed scope.Close() calls