diff --git a/build.gradle b/build.gradle
index 29a91490..dd51bc57 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,9 +6,7 @@ buildscript {
    // (in this case, javafx-plugin is compiled against 11, while we want the build to work in 8)
 
    repositories {
-      maven {
-         url 'https://plugins.gradle.org/m2/'
-      }
+      gradlePluginPortal()
    }
    dependencies {
       classpath 'org.openjfx:javafx-plugin:0.0.9'
@@ -142,6 +140,8 @@ if (JavaVersion.current().java11Compatible) {
 // Now the task needs to be run manually.
 compileJava.dependsOn = compileJava.dependsOn - 'generateScenarioSource'
 
+sourcesJar.dependsOn ':generateScenarioSource'
+
 generateScenarioSource.enabled = false
 tasks.register('genModel', JavaExec) {
    generateScenarioSource.copyTo(it)
diff --git a/test/doc/images/studyRightObjects.png b/test/doc/images/studyRightObjects.png
index 3d85dfd8..e5180083 100644
Binary files a/test/doc/images/studyRightObjects.png and b/test/doc/images/studyRightObjects.png differ