Windmill fixes