Hopefully fixed all problems I caused on Windows.