Fix syntax and ann windows support