Fixes related to the changes on the CI server...