Still fixing Spyder builds and other tweaks