Tidy up and fix sporadic CI failures
1.3.3