Making things compile on Windows again