Fix some compilation issues.