Gitlab fixes

Cecylia Bocovichrequested to merge
gitlab_fixes into master

Some minor fixes for bugs that came up when running the new gitlab update on gettor-01.

Merge request reports