Fixed bugs from removed windows 8 support