Even more compile fixes.