Windows fixes
Bumped SPIs