Merge: Some more small improvements on gitlab-ci