fix compilation errors due to recent commits.