Trying to fix compile problems.