Construction 3 merge 3

Pulling this for JAR building fixes