Version fixes as well as bad bug in IsDesktop()