New fixes for compiling on newer Java versions#49

Foxinatel wants to merge 3 commits intoTeachingTechnologistBeth:masterTeachingTechnologistBeth/ModuleSim:masterfrom

Foxinatel:masterFoxinatel/ModuleSim:masterCopy head branch name to clipboard