Version 25.0, fix windows compiles