Fix various build problems.
1 file changed