Small bug fix and windows deprecation