Compile fixes for Windows after merging animation branch.