Some compile fixes.