Squash Me later - try to fix windows compilation