diff --git a/src/components/sites/allAccessibleExercisesSite/closedExercisesSite/listView.tsx b/src/components/sites/allAccessibleExercisesSite/closedExercisesSite/listView.tsx
index a873edd5bc5081bc411ad5a233cd09e0342dd0db..6dc3c1dc09d99e65d85fb31df00369daa4f1ca5d 100644
--- a/src/components/sites/allAccessibleExercisesSite/closedExercisesSite/listView.tsx
+++ b/src/components/sites/allAccessibleExercisesSite/closedExercisesSite/listView.tsx
@@ -210,7 +210,12 @@ class AllAccessibleExercisesList extends React.Component<Props, any> {
                   }
                 </span>
               </Table.HeaderCell>
-              <Table.HeaderCell>
+              <Table.HeaderCell
+                sorted={
+                  isCurrentSortingColumnPaginated<ExercisePreviewFromBackend>(this.props.sortByKey, 'releasedForPLangId',
+                    this.props.sortDirection)
+                }
+              >
                 <span className="clickable"
                       onClick={() => {
                         this.props.setSortByKey('releasedForPLangId',
diff --git a/src/components/sites/allAccessibleExercisesSite/openExercises/listView.tsx b/src/components/sites/allAccessibleExercisesSite/openExercises/listView.tsx
index 2b32075bdc0c1b05af88e4b2938c468943386fa6..eb0a5b4b32f879dfbbc10677b9f817eb0af3cbe4 100644
--- a/src/components/sites/allAccessibleExercisesSite/openExercises/listView.tsx
+++ b/src/components/sites/allAccessibleExercisesSite/openExercises/listView.tsx
@@ -219,7 +219,12 @@ class AllAccessibleExercisesList extends React.Component<Props, any> {
                   }
                 </span>
               </Table.HeaderCell>
-              <Table.HeaderCell>
+              <Table.HeaderCell
+                sorted={
+                  isCurrentSortingColumnPaginated<ExercisePreviewFromBackend>(this.props.sortByKey, 'releasedForPLangId',
+                    this.props.sortDirection)
+                }
+              >
                 <span className="clickable"
                       onClick={() => {
                         this.props.setSortByKey('releasedForPLangId',
diff --git a/src/components/sites/allAccessibleExercisesSite/openExercises/openExercisesViaCodeSite.tsx b/src/components/sites/allAccessibleExercisesSite/openExercises/openExercisesViaCodeSite.tsx
index 97f8d9fc4c60a76643ec8bcf3456ddf856286e2b..e4ac3912a02c8c592ff3fc08128f94343f5acf6e 100644
--- a/src/components/sites/allAccessibleExercisesSite/openExercises/openExercisesViaCodeSite.tsx
+++ b/src/components/sites/allAccessibleExercisesSite/openExercises/openExercisesViaCodeSite.tsx
@@ -142,7 +142,7 @@ class OpenExercisesViaCodeSite extends React.Component<Props, any> {
 
     clearInterval(updateLeftTimeIntervals)
 
-    updateLeftTimeIntervals = setInterval(() => {
+    updateLeftTimeIntervals = window.setInterval(() => {
 
       const copy = updateExercisePreviews(this.props.openExercisePreviewsViaCode, clientServerTimeDiffInS, this.props.langId)
 
diff --git a/src/components/sites/allAccessibleExercisesSite/openExercises/openExercisesViaVisibilitySite.tsx b/src/components/sites/allAccessibleExercisesSite/openExercises/openExercisesViaVisibilitySite.tsx
index 8992eff3446b2146562da770540b7e32eff59c02..3c7edebb132582eddeccda8bcc7ce144460afc54 100644
--- a/src/components/sites/allAccessibleExercisesSite/openExercises/openExercisesViaVisibilitySite.tsx
+++ b/src/components/sites/allAccessibleExercisesSite/openExercises/openExercisesViaVisibilitySite.tsx
@@ -141,7 +141,7 @@ class OpenExercisesViaVisibilitySite extends React.Component<Props, any> {
 
     clearInterval(updateLeftTimeIntervalsViaVisibility)
 
-    updateLeftTimeIntervalsViaVisibility = setInterval(() => {
+    updateLeftTimeIntervalsViaVisibility = window.setInterval(() => {
 
       const copy = updateExercisePreviews(this.props.openExercisePreviewsViaVisibility, clientServerTimeDiffInS, this.props.langId)
 
diff --git a/src/components/sites/dashboardSite/hardwareUsageView.tsx b/src/components/sites/dashboardSite/hardwareUsageView.tsx
index e7dfdbc2a3837bffa4574b198ba06b5f3e091005..1ad2b0f9a0177e6ca2bedc70a289d71a72534aab 100644
--- a/src/components/sites/dashboardSite/hardwareUsageView.tsx
+++ b/src/components/sites/dashboardSite/hardwareUsageView.tsx
@@ -59,7 +59,7 @@ class hardwareUsageView extends React.Component<Props, any> {
 
   async componentWillMount(): Promise<void> {
 
-    intervalHandle = setInterval(async () => {
+    intervalHandle = window.setInterval(async () => {
 
       if (this.props.isHardwareUsageStatisticRefreshing) {
         await this.props.getHardwareUsageAsync()
diff --git a/src/components/sites/doExerciseSite/doExerciseSite.tsx b/src/components/sites/doExerciseSite/doExerciseSite.tsx
index c0d4afaab5af74cb5df349aa0788d6615200a975..c39ac391e46865da84befb91da1380e55bd0a77f 100644
--- a/src/components/sites/doExerciseSite/doExerciseSite.tsx
+++ b/src/components/sites/doExerciseSite/doExerciseSite.tsx
@@ -517,7 +517,7 @@ class doExerciseSite extends React.Component<Props & RouteComponentProps<Matched
   componentDidMount(): void {
 
     //could be moved to  componentWillMount but not needed
-    this.refreshTokenTimeoutHandler = setInterval(this.hasEditorChangedAndUpdateAuthTokenLifetime.bind(this),
+    this.refreshTokenTimeoutHandler = window.setInterval(this.hasEditorChangedAndUpdateAuthTokenLifetime.bind(this),
                                                   refreshAuthTokenLifetimeIntervalWhenEditingInMs
     )
   }
@@ -888,7 +888,7 @@ class doExerciseSite extends React.Component<Props & RouteComponentProps<Matched
     const clientServerTimeDiff = moment().diff(serverTime, 'seconds')
 
     const wasAtSomePointEditable = this.checkTimeUsedUp(clientServerTimeDiff, null) //call it immediately because the first tick of the interval will be in 1 sec
-    updateLeftTimeIntervals = setInterval(() => this.checkTimeUsedUp(clientServerTimeDiff, wasAtSomePointEditable),
+    updateLeftTimeIntervals = window.setInterval(() => this.checkTimeUsedUp(clientServerTimeDiff, wasAtSomePointEditable),
                                           1000
     )
 
diff --git a/src/components/sites/manageOwnOrGroupExerciseComponents/submissionsSite/headerBarContent.tsx b/src/components/sites/manageOwnOrGroupExerciseComponents/submissionsSite/headerBarContent.tsx
index 465ef872fab291ae5e46e1676bc360ca9d5ea819..d7b047f572d97cdda18e1b856b769bc04826ece3 100644
--- a/src/components/sites/manageOwnOrGroupExerciseComponents/submissionsSite/headerBarContent.tsx
+++ b/src/components/sites/manageOwnOrGroupExerciseComponents/submissionsSite/headerBarContent.tsx
@@ -113,7 +113,7 @@ class HeaderBar extends React.Component<Props, any> {
   }
 
   createAutoRefreshViewInterval(): void {
-    this.automaticRefreshViewIntervalHandle = setInterval(() => {
+    this.automaticRefreshViewIntervalHandle = window.setInterval(() => {
 
       this.props.setAutomaticRefreshViewIntervalCounter(this.props.automaticRefreshViewIntervalCounter - 1)
 
diff --git a/src/global.d.ts b/src/global.d.ts
index 4f582d86c9a023dda8631f24299208e4710e17c8..7e966f6af0444c47fc8f3266530647787aa8d915 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -7,4 +7,4 @@ declare const require: {
   ensure: (paths: string[], callback: (require: <T>(path: string) => T) => void) => void;
 };
 */
-declare function require(s: string): any
\ No newline at end of file
+// declare function require(s: string): any
diff --git a/yarn.lock b/yarn.lock
index cc4e299b974666552dcbe6c107e00bb251c2c02f..b5635d5d25d45bbd2928458c695c90f6ac8bcee2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3722,7 +3722,7 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
-markdown-it-container@^3.0.0:
+markdown-it-container@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/markdown-it-container/-/markdown-it-container-3.0.0.tgz#1d19b06040a020f9a827577bb7dbf67aa5de9a5b"
   integrity sha512-y6oKTq4BB9OQuY/KLfk/O3ysFhB3IMYoIWhGJEidXt1NQFocFK2sA2t0NYZAMyMShAGL6x5OPIbrmXPIqaN9rw==