More fixes for newer versions of Aqua #31

Job	Run time
Julia nightly - ubuntu-latest - x64 - push	2m 38s
Julia nightly - ubuntu-latest - x86 - push	3m 51s
Julia nightly - macOS-latest - x64 - push	5m 5s
Julia nightly - windows-latest - x64 - push	3m 26s
Julia nightly - windows-latest - x86 - push	5m 41s
Julia 1.6 - ubuntu-latest - x64 - push	57s
Julia 1.6 - ubuntu-latest - x86 - push	1m 3s
Julia 1.6 - macOS-latest - x64 - push	2m 7s
Julia 1.6 - windows-latest - x64 - push	10m 23s
Julia 1.6 - windows-latest - x86 - push	8m 40s
Julia 1.0 - ubuntu-latest - x64 - push	53s
Julia 1.0 - ubuntu-latest - x86 - push	1m 9s
Julia 1.0 - macOS-latest - x64 - push	2m 55s
Julia 1.0 - windows-latest - x64 - push	3m 40s
Julia 1.0 - windows-latest - x86 - push	4m 29s
	56m 57s

Provide feedback