Fixed more compilation issues.