Spec updates
Fix build failures on windows