Compile fixes for Linux after merging animation branch.