Rebuild on Nikola 6.4.0, with other fixes